bitkeeper revision 1.1159.241.2 (4202bc56K28qaGGkiiKbJBLxsgnXSA)

Enable monitor assert. Earlier assert was broken and was deleted.

Signed-off-by: Joe Cihula <joseph.cihula@intel.com>
Signed-off-by: ian.pratt@cl.cam.ac.uk

diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index be9fd82f0070cdfb150de0fd32e024f89ec190a3..7190da7fde872891b5ef81f35d2a7aa89898f2f3 100644 (file)
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -346,6 +346,8 @@ static void monitor_rm_pagetable(struct exec_domain *ed)
     l2_pgentry_t *mpl2e;
     unsigned long mpfn;
 
+    ASSERT( pagetable_val(m->monitor_table) );
+    
     mpl2e = (l2_pgentry_t *) map_domain_mem(pagetable_val(m->monitor_table));
     /*
      * First get the pfn for guest_pl2e_cache by looking at monitor_table